From 46966baa2b86ad110539d53a9887050fb63abb18 Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Tue, 10 May 2005 10:52:14 +0000 Subject: [PATCH] bitkeeper revision 1.1389.12.1 (4280925ekcX_kR7M1jSOr7hTahPv2A) Remove asm/pci.h. Signed-off-by: Keir Fraser --- .rootkeys | 1 - xen/arch/x86/setup.c | 8 -------- xen/include/asm-x86/pci.h | 35 ----------------------------------- xen/include/xen/pci.h | 4 ---- 4 files changed, 48 deletions(-) delete mode 100644 xen/include/asm-x86/pci.h diff --git a/.rootkeys b/.rootkeys index 8ae8c05f21..064cb3d7d0 100644 --- a/.rootkeys +++ b/.rootkeys @@ -1376,7 +1376,6 @@ 41aaf567Mi3OishhvrCtET1y-mxQBg xen/include/asm-x86/mtrr.h 41a61536MFhNalgbVmYGXAhQsPTZNw xen/include/asm-x86/multicall.h 3ddb79c3xjYnrv5t3VqYlR4tNEOl4Q xen/include/asm-x86/page.h -3ddb79c3ysKUbxZuwKBRK3WXU2TlEg xen/include/asm-x86/pci.h 42422fb0FVX-TJkSvAXnbfwMf19XFA xen/include/asm-x86/physdev.h 3ddb79c2QF5-pZGzuX4QukPCDAl59A xen/include/asm-x86/processor.h 40cf1596bim9F9DNdV75klgRSZ6Y2A xen/include/asm-x86/regs.h diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 37cc2c4684..f4967e9317 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -341,12 +341,8 @@ static void __init do_initcalls(void) (*call)(); } -unsigned long pci_mem_start = 0x10000000; - static void __init start_of_day(void) { - unsigned long low_mem_size; - #ifdef MEMORY_GUARD /* Unmap the first page of CPU0's stack. */ extern unsigned long cpu0_stack[]; @@ -362,10 +358,6 @@ static void __init start_of_day(void) arch_do_createdomain(current); - /* Tell the PCI layer not to allocate too close to the RAM area.. */ - low_mem_size = ((max_page << PAGE_SHIFT) + 0xfffff) & ~0xfffff; - if ( low_mem_size > pci_mem_start ) pci_mem_start = low_mem_size; - identify_cpu(&boot_cpu_data); /* get CPU type info */ if ( cpu_has_fxsr ) set_in_cr4(X86_CR4_OSFXSR); if ( cpu_has_xmm ) set_in_cr4(X86_CR4_OSXMMEXCPT); diff --git a/xen/include/asm-x86/pci.h b/xen/include/asm-x86/pci.h deleted file mode 100644 index c5f72c0fae..0000000000 --- a/xen/include/asm-x86/pci.h +++ /dev/null @@ -1,35 +0,0 @@ -#ifndef __X86_PCI_H -#define __X86_PCI_H - -#include - -/* Can be used to override the logic in pci_scan_bus for skipping - already-configured bus numbers - to be used for buggy BIOSes - or architectures with incomplete PCI setup by the loader */ - -#ifdef CONFIG_PCI -extern unsigned int pcibios_assign_all_busses(void); -#else -#define pcibios_assign_all_busses() 0 -#endif -#define pcibios_scan_all_fns(a,b) 0 - -extern unsigned long pci_mem_start; -#define PCIBIOS_MIN_IO 0x1000 -#define PCIBIOS_MIN_MEM (pci_mem_start) - -void pcibios_config_init(void); -struct pci_bus * pcibios_scan_root(int bus); -extern int (*pci_config_read)(int seg, int bus, int dev, int fn, int reg, int len, u32 *value); -extern int (*pci_config_write)(int seg, int bus, int dev, int fn, int reg, int len, u32 value); - -void pcibios_set_master(struct pci_dev *dev); -void pcibios_penalize_isa_irq(int irq); -struct irq_routing_table *pcibios_get_irq_routing_table(void); -int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq); - -#include -#include -#include - -#endif /* __X86_PCI_H */ diff --git a/xen/include/xen/pci.h b/xen/include/xen/pci.h index 5f8740a31c..046328d11e 100644 --- a/xen/include/xen/pci.h +++ b/xen/include/xen/pci.h @@ -678,10 +678,6 @@ void pci_pool_free (struct pci_pool *pool, void *vaddr, dma_addr_t addr); #endif /* CONFIG_PCI */ -/* Include architecture-dependent settings and functions */ - -#include - /* * If the system does not have PCI, clearly these return errors. Define * these as simple inline functions to avoid hair in drivers. -- 2.30.2